From 9d0f559a4d165fca10ebb0b202f382c34adb1fb5 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 31 Mar 1993 23:42:37 +0000 Subject: [PATCH] (indent-for-comment): Use skip-syntax-backward in place of skip-chars-backward. Correctly set INDENT to the return value of comment-indent-function. --- lisp/simple.el | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lisp/simple.el b/lisp/simple.el index ef6a011afdf..0a7a5bc19af 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1523,18 +1523,19 @@ the comment's starting delimiter.") ;; position at the end of the first pair. (if (match-end 1) (goto-char (match-end 1)) - ;; If comment-start-skip matched a string with internal - ;; whitespace (not final whitespace) then the delimiter - ;; start at the end of that whitespace. - ;; Otherwise, it starts at the beginning of what was matched. - (skip-chars-backward " \t" (match-beginning 0)) - (skip-chars-backward "^ \t" (match-beginning 0))))) + ;; If comment-start-skip matched a string with + ;; internal whitespace (not final whitespace) then + ;; the delimiter start at the end of that + ;; whitespace. Otherwise, it starts at the + ;; beginning of what was matched. + (skip-syntax-backward " " (match-beginning 0)) + (skip-syntax-backward "^ " (match-beginning 0))))) (setq begpos (point)) ;; Compute desired indent. (if (= (current-column) - (if comment-indent-hook - (funcall comment-indent-hook) - (funcall comment-indent-function))) + (setq indent (if comment-indent-hook + (funcall comment-indent-hook) + (funcall comment-indent-function)))) (goto-char begpos) ;; If that's different from current, change it. (skip-chars-backward " \t") -- 2.30.2